Fixed device creation
3 files changed