server bug fixes