Changes at David's house 8/17/13 to repair build errors.