Fix some stuff, i guess