More fixes, MORE!