Fix several classes
Update ChangeLogs