More Fixes

Finished with compilation errors