More fixes?
Merge pull request #309 from dreamteam69/master

More fixes?