Changes for Mac compatability