CPU Usage and fixes