0.30 fixes

Bug #1319 is pretty severe. Please merge to master as well.