Final bugfixes for new chunk based internal storage