0.9.1 compat + minor improvements