Fix collectstatic issues