Applying some changes from destringification