Fixes for the HTTP Layer