More fixes
And this too :neckbeard: