Minors optimizations#9

NumEricR wants to merge 2 commits intoremi:masterremi/pubwich:masterfrom

NumEricR:OptimizationsNumEricR/pubwich:OptimizationsCopy head branch name to clipboard