Make some improvements