Minimal change needed for heist 0.14 support