minor improvements for server