Static resource serving
Static resource serving fixes