fixes to use _mcall