Fix Deprecated warnings