Cleaned up compile errors