Tweaked minor things