Attempt to fix Travis build errors