Fix some Deprecated