Minor Improvements

Fix Travis testing