Fix bugs involving empty classes.