apply recent chopstick fixes