Fixed minor variables