Small improvements for non-vertical containers