Fixes for #1163; Fixes for #1177; and Fixes for #1186