Fixes to typings.