Fixed some more cpu issues.