Fixes for 431, 434 and 457