More hand sieve bug fixes