More fixes for 1.1 API