monkey: Updates made to bring in line with jb-dev changes