Client requests fixes