0.19 fixes

This PR should handle #1122, #1118, #1117, #1047
yea true, will change it to ```def``` for now and use ```defn``` if we need to later.