Misc fixes

Martinez, Eric M. requested to merge github/fork/emartinez-usgs/misc-fixes into master Feb 13, 2014