Do some improvements