Fixes to work with 0.9.11