Minor clean ups.