Minor changes to several classes