Some potential little fixes