Two small fixes which came up in the context of state restore

Merge request reports

Loading