Some fixes & testing on Linux.