More fixes
Merge pull request #429 from dreamteam69/master

More fixes