Misc updates for testing VGA