Merge branch 'fix-types'