Fix stupid small compilation mistakes that I made in the last merge