More fixes, still some errors