Small changes to take in account the last api changes.