more fixes for 6.1.1