More 0.10.x adaption
Missing code + fix warnings