More fixes for flip