Minor updates to build