Additional corrections to type definitions