Fix: missing declaration of some vars