Bump version
Fix reviewer concerns