Small fixes and bumping version