correcting the server entities