More fixes thanks to Heidi