Fixed some stuff that broke the build