Type fixes, and fonts