Kevin Roth's fixes
2 files changed