Build fixes. BTW, we're going for 0.9 now.

9 files changed