Updated to repair breakages from NMS/OBC Version Refactoring.

hi.