Fixes for 680 681 and 686