Remove cihai dep for testing. Travis: rm apt-get update. Add some more _compat.