Making query improvements
Fixing problems
Fixes for project
Making the compiler happy and fixing DeviceManager code