fix some stuff for JB