Additional changes to 326f2a0