small device fixes