A few small fixes, Index is error-free