Deprecated warnings resolution