Fix byte-compiling warnings for not MacOSX platform
Improve persistent action