Correcting DB related issues