Some additional changes for refu c lib templates