* Core/Misc: Fix issues reported by static analysis
* Core/Vmaps: Code cleanup after e777161888
(cherry picked from commit cfc8f7b442a9dba07b198fcebe2c02ab89cf0a8b)
* Core/Misc: Fix issues reported by static analysis
* Core/Vmaps: Code cleanup after e777161888
(cherry picked from commit cfc8f7b442a9dba07b198fcebe2c02ab89cf0a8b)