Fix issues discussed in meeting