Fixed fish and name-tag emc values
Merge remote-tracking branch 'origin/master'