Fixes for limits - introduced in previos commit