Core/VMaps: Fixed some logic

Closes #930