Fix consumes2

Second round of consumes fixes.