Two Modifications of Mean-Variance Portfolio Theory