Minor changes to fix build.