Minor coding D7 standard udpate