Fixed linking in startup