Some fixes in draft