Fix expression positions