more consumer rake fixes