More deviceserver fixes. Closes #7