JB suggestions and fixes