Simple bug fixes :)