Fixes to morpheus to build with main build system.