Minor bug fixes
Version bump