Fix pace so it gets into optimized app, some performance fixes