Some more fixes to pass travis. Do away with print statements.