More fixes
Updated stuff