Improvements

Those 2 calls same as above.