Upper bounds for #189
Some patches