Migrated a few more nibs