0.30 fixes

The last bug is pretty severe. Please merge to master as well.