Fixes for domain move.