Updates in line with recent ohNet API changes