Additional changes to 95e6b4b