Fixed bug 1 from Travis, added bug 2 for Travis