Database update, small fixes