Fixups for the waf move