Fixing load path issues from last 2 commits