Merge to master

A few really small changes to get TTF to work.