0.9.0 semi-final hotfixes since the hughe rewrite