A few little fixes as promised

Please test it out locally, though! :-)