Fix some 404/405 error