Improve handling of external platform targets