More fixes, thanks to Piter01