Further build changes from Roger