More fixes in manual and API