Compilation fix in release version and test fix