Device font handling fixes