dwb: minor stuffs