Fix extrafield and bugs