Resolved some compile errors