Some more ambiguities fixed