Minor bug fixes
Bug fixes