Fixed syntax errors after the cleanup of data fields.