Tweaks for working with bork