Fixed some Calls not being resolved