Minor changes to build on ignatius