MEDIUM / Fix issues