Fix more breakage
Prepare for cargo.io