Improvements for size limit