[CHORE] Minor changes to allow functionality in 6.1