Fixes for incorrect response statuses