OD bug workarounds and improved safety