More fixes for inline installer build