Misc Tweaks

A few minor changes I noticed in trying to get the code to work on my workstation.