Expression bug fixes