Fixes from Ryan
2 files changed