Clean up minor things resulting from new install