Mstead/compliance js spike fixes