mcall: Fixed remaining issues from previous commit