moar fixes because bendem