Cleanup
More fixes