Fix site manifest parse error and more