Fix funccall, Maps