A few fixes and bumping version number