fixes for hardware CRUD