Fixing some missing indexes and fields