More changes to the CPU for shell related items.