Minor changes for compatibility with the lastest yasem-core