Minor little fixes