indent rewinds, compatibility fixes