Fix some vars