Fixin some stuff.