Minor Sandcastle fixes