Add device asserts back for now