few more fixes in roadmap