BUG: Add missing initialization variables