A few little fixes

See commit comments