Minor bug fixes!