Core/Misc: some random changes after recent pull requests