Some fixes for 0.10.2