Temporary changes to support B29. Will make it nicer when v1.0 is out.