Field fixes