Minor updates to build with jb libs