fixups from nkouevda & watabou feedback