Changes to build with FORTE compiler