Compile errors from transfer fixed