Re-add device asserts