Improved/fixed request handling.