Bug fixes and improvements to targeting system to prevent incorrect targeting at times and incorrect "Invalid target" messages