Cleaned up some compile errors