2.5.x fixs for DDF-737 and DDF 736

Sorry I had already committed both of these before I read the suggestion to do individual pull requests.  Although these are no brainers