JB improvements and fixes