Sort out some of the context menu issues...