Fixes to make it work with final 0.11