More absolute path related changes