fix warning with -Wshadow in Thread & SpyBehavior
fix warning with -Wnewline-eof