small fixes on nephoscale due to driver refactoring
nephoscale driver refactoring issues
Merge branch 'master' into keys_refactoring