Silly bug fixes