Old syntax for dicts
More fixes for v0.3 compat