Updates for Linux compatibility