Fix some leftovers and long index names
Merge pull request #24 from rbCAS/fix-indexes

Fix some leftovers and long index names