Linux Mac Version fixes & compiling