Fixes for 400, 424 and 432