Additional changes to 799b4e6