Fixed/updated expressions