Some work towards supporing not-always available APIs