Hopefully fix some compile errors. Again, massive thanks to Michyprima for your help!