Fix manifest validation. Closes #1857