Resolve targets earlier for make and run