Fixing a few old "issues"

Commits actually explain them quite well :)