0.19 fixes

This PR should handle #1122, #1118, #1117, #1047