Fixes, upgrade tool dba1246