Fixed discussed things