Fix some stuff

Fixes, Fixes everywhere :fearful: