Post merge fixes. Code compiling and make check running again.