Fix expression warnings