Fixes of linker rules