Additional changes to e0f2410