Couple more tweaks for Michael!