Fix selection, and some DecoratorHeader improvements.