Fixes from playtest.