Quick and dirty spatial filtering fixes