fixes to be compatible with recent api changes