Configuration ci options fixes