Misc. data management changes