Version bump
Additional fixes