More class hierarchy fixes