expression fixes