Fixes for the new linking order