More minor things

Thanks!