Bug fix for IgnoreResourceNotFound and general tidy up