Pull in latest changes to virtualfish