fix some linking bugs
Merge remote-tracking branch 'github/master'