device/register + fixes