RE: Performance fixes