Fixed some stuff again