nmbryant wlparker fixes changes to a couple of files by previous commit