Two little bugs needed some fixing