Fixed checks for deprecated fields