more tweaks following the s3 - master merge