Fixin' some stuff