fixing a few more tickets.