Fixes from working with Bryan to get his local server running.