Compile fixes for core

Should be done after some nova fixes
https://github.com/cfengine/nova/pull/647
(which, in turn, depend on some enterprise fixes) to avoid breaking nova.