Gatekeeper fixes for Rietveld integration