More fixes to 0.1b APIs