Final Draft Modal Fixes