Multiple code sanity changes to main codebase

Created originally on Bitbucket by berlincount (Andreas 'count' Kotes)

Was already merged in Bitbucket before import, marked as merged by the import user