Fixed attribute mismatches