more jb fixes