Reflect 1.x org changes, and correct build command.