More index and constructs fixes.