Fix paths properly, should build now when used as a Pod.
Merge branch 'develop'