Minor fixies.