FIX: OTF Build process