Fixing dome deprecated warnings
Fixing build