Minor changes in build