Small update

Updated a few changes to match 6-core variant