Fix for METADATA and LONGSHOT errors.