Minor base environment modifications