Device Fixes