Some changes made to various classes