Moar fixes and stuff