Never enough

Never enough fixes for bugs introduced by previous changes just
committed