Resolve two errors resulted from refactoring VJ