some little fixes for jb