Small corrections for better match to the old api