Fixed some stuff that broke the last push