Minor expression and reflection changes