Fixes on the OSX serving techniques