small bug fixes, migrated server