var pattern fixes