Fixing some private class issues