Fixes to interaction bugs, especially around addgloss