Fix remaining client import errors and update travis