Small bux fixes to index-object