Minor changes to build