Fixed some issues Travis brought up