More fixes to match Sandstone.