More bug reports and fixes for 5.6.x