Static dir fixes