Smaller changes and corrections across several classes