Fixed some issues resulting from transferring the code