Fixed issues with implicit resolution