fixes for virtual library 61553824 and 61725600