A few minor tweaks

by Jesse Bauer