Bug

A collection of 2 issues