Bug fixes found from Travis