Fix line numbers in scenarios
Fix deprecation warning