Callerid fix and warning cleanup (bug #367 & #356)