Fixed issues in UNIX when compiling as per issue #4