Additional upper bounds for #217 and #218