linking bug fixes