Fix for #958
Fix for #963
Fix for #966
Fix for #967
Fix for #969
Fix typo