More fixes for invisible characters