Some updates when moving to new server