Fixed most ShortVariable jenkins warnings