Resolve compile-time deprecation warnings