Minor clean ups