Rudimentary affinity support
Reverted cpu affinity changes
Fixed potential difference issue