Fix/add base-env types for Ref 14.4.3