Closing ans answering actions fixes