Updated some stuff to get it to compile again properly