merge in fixes from virgo