Adding Bob's fixes to the backwards-compatibility API