DataManager type fixes