fixes in Database module usage