Fixes for ambiguity warnings