A few tweaks

A few minor tweaks for ya.