update drawbridge stuffs from 1.6.x