Fixed: Moar fixes