Fix warnings and duplication in voicecall code