Draft: Fixes in Draft edit