Fixes to tift for latest concrete