JBA small changes