ADB fixes