Make a few more classes private