more tweaks from Dimensions