Fixed errors and made sure compiling works again