Minor flavor updates

Everything seems to be working; I'm cautiously optimistic.