Fixing some Contract index stuff