Fixes to Rebecca's branch.