Bug fixes with default scope behavior