Some minor clean-up here and there
Merge branch 'master' of https://github.com/Discover-/SAI-Editor