Fixing some bugs on LINUX
Merge