More rebar fixes.