Rework some awkwardness