And few little nbsp-oriented fixes at last