Fix tool/bootstrap decorations