Further fixups for change to long on attribute datatype.