Fixing missing changes from latest merge