Fixed some issues with the Linux builds