Modifications for MacOS