Fixes after testing with vhub