Small fixes for unresolved expressions