[behdad] More degenerate fixes