A couple of smaller fixes and improvements.