Corrected string declares and minor metadata tagging updates.