minor build-time fixes for OKC