fixes for inner types, spec 1.2 conversion
fixes for inner types, spec 1.2 conversion