More fixes for https://webarchive.jira.com/browse/ARI-3985