Some notation conflicts solved