Corrected some mistakes on the build process
Corrected breaking issues, as mentioned on pull #2