A fix to the build and the jump-to-definition feature. Fixes #544, fixes #633

Fixes #544, fixes #633
Anyone know a better/nicer way?