A few changes on serving static files