More fixes, still need to refactor the serve files demo