Minor bug fixes
Update version