Random little fixes