Off path fixes 3