Bug 865471 - Fix various sps profiler issues. r=jandem