Minor fixes for linking support in ONE