Fixes for Christina's review comments.