A few tweaks

Two fixes, two change proposals, and one fix-my-own-mistake