Fix vars + roadmap