Fixed bugs, notably VF not getting set when drawing over something