Improve minor things