organization migration fixes