Move source and target compat methods where they belong