Resource fix ups