FIx warnings in Database+Server