Fixes for moving to new domain...