Fix implicit resolution issues