NMS-6015 fix field lengths to match the database