Minor changes to allow test build compilation.