More fixes for orm install