Fixes for v0.3-alpha.0