FPS drops since recent patches

@Kitten, glad to hear you were able to resolve this.

@Cochese, please let me know how you get on also!