Fixes for recent changes in 483350 (ohnet API changes)