Small type improvements