Fixed tiny bugs

Tiny bug fixes!