Data manager lazy initialization bugfixes