More fixex.
Merge pull request #441 from nZEDb/dev

More fixex.