Sync up with minor changes in rc3 databind