classes: small bug fixes