First definer fixes
Dima initial commit