* Minor fixes in database storage