Bug Fixes in NDC Phase 1