Fixup python path and ensure it's included everywhere