More fixes, should work fine