accessories fixes