Deprecated warning fixes.