Summer 2014 Fixes for NDPCR