More fixes bring it to slightly deployable state