Fixed compile errors in 0.13