Working on static field DMH's fixes