Minor bug fixes...