Fixed a few OS level bugs..
Merge remote-tracking branch 'origin/SagieBranch'