0.19 fixes

This PR should handle #1122, #1118, #1117, #1047
this could be a `def` since it doesn't take any args, but maybe it will in the future