Fix compilation errors / Cleanup