Various changes to add a spacer filter and tighten up some other checks