Fix compile errors on 0.11