Profile some fixes