Hand sieve bug fixes