Some fixes goddamnit