Small fixes for Yara