Fixing some problems but not requiring entypo-fonts