Fixed setup and site manifest