MEDIUM / Fix some minor issues