Bug fixes in Expression