cjgb Fixes to include extra NA codes in data