Sifter changes and tweaks