Some fixes

Nothing exciting going on here, but submitting a PR anyway as I would otherwise get merge conflicts when continuing to work on font color fallback settings.