Modified code locations to get travis working.