Edits from a while ago

Basically trying to make travis happy.