Bugfixes for NonAjax requests