Fix admin toolbar issues with MP6