Small type and style issues