Fixing some bugs in drafts/interactivcom/mockup_1444