Several changes to the profiler controller