Fixing match view warning messages.