fixes for new MB