Resolved some db device issues