MEDIUM / Fixed minor issues