Modifications for Linux environment