fixes & quick test in Linux