Tweak to http handler and OS X make file