Fixes for font usage, ignore the state machine stuff for now.