Additional changes to 4f26f77