Fixed database things