Updated to BNW and patched G&K source.
Updates required for local compilation.