Initial updates to build with jb-dev branch