formatting fixes

Minor fixes, including one that will resolve the travis failures