Small bug fixes
Version update + Small bug fixes.