Some draft fixes