Fix slicing of environment overrides and comment