Font scaling and some other minor fixes