Updates made to build with jb-dev branch