Some fixes for 10