Merge "Fix database properties"