Fixing more locks held during suspension problems (Possible fix for #1034)