Fix compilation errors
Fix errors