More little fixes