Some minor update according to api changes.