Minor tweaks and fixes

Just a few minor tweaks and fixes here.