More fixes, please