Minor improvements.
Temp fix to satisfy JSHint.