Research Site migration fixes