Fix issues with source install