Fix two bugs found by Scott Snyder
3 files changed