More fixes as pointed out by Ms2ger