Fixed some cross-link issues
Merge pull request #12 from nhr/build_fixes

Fixed some cross-link issues