[CLAMP-1] Changes to match build