Multiple little fixes