(Griffin) Build fixes