Add additional checks for index size when writing various items
3 files changed