* Minor bug fixes
