linking fixes