Another set of Linux fixes