Resume fixes