Multiple fixes for BUDDHA and FOILINVUL.