A few extra fixes as pointed out by AyrA