Fixes from running on conway dump