fixes for MP