Fix some lingering issues from the indexing change.  Closes #413 and #414.