Fixes #2192
Fixes #2148
Fixes #2128