Properly fixed compile errors