Fixed some stuff from the previous commit