2.1.5 Fix issues with framework location