Several small changes for JRF