A few more small changes

Nothing big.