Random fixes

Commits sorta explained in their information.