* Minor bug fixes