Fix devices accessor
Fix messaging