Some small improvements

Really nothing worth a lengthy comment.