Small tweaks...

Will fold these updates into the current tag since this update is so close.