Fix changes from 64bit branch to allow build with fbc from before 83fb8877