Fix declaration compatibility