Fixes to site master