Filter static and fixes