Adjust some forgotten things in DB api