A few little fixes