Fixed some compile errors
Fixed some errors and merge conflicts