new jo fix, ce table fix
Merge remote-tracking branch 'remotes/origin/fixes'