Minor cleanups / updates to Signal support