Improve handling of FINAL publications