Bug Fixes for GVN