Some chunk management improvements