Fixes for 0.11+