Minor fixes from Harvard Code