Minor changes to stage 4.
Merge pull request #655 from nZEDb/dev

Minor changes to stage 4.