Fix 'could not imort Base.add!' and '... conflicts with an existing iden...

...tifier' warnings