Fix 2163 and others

| Q	                       | A     |
|--------------------------|------ |
| Bug Fix?        	| y     |
| New Feature?	| n     |
| BC Breaks?	       | n     |
| Deprecations?	| n     |
| Tests Pass?	       | n     |
| Fixed Tickets	       | #2163 also|
| License	               | MIT |
| Doc PR                  |        |