Record fixes.

This will fail grunt until blue-button enhancements are accepted.