Removed some bugs that Travis showed me