A few little fixes

This would have been enough :)