Fixing compilation issues in the delite branch