Minor changes in the client main module.