Fixing further screwups from this morning