Update to deal with issues in 3.1.4+ and also some additional common problems in asset tables.