Common Core Standards setup tweaks