Additional changes to a639c51