Improved minor things