Type and style fix