More squisher updates

Change-Id: I843e385a277e45e5c8cec6828b41608799e650f5