- more dynamic fixes (x86_64 builds now)