Small fixes while migrationg to another server