subscript fixes