OSGi/catalog improvements

Personal preference for always adding `@Override`.