Cool changes. Travis build should now complete without errors.