#9 A few little fixes