Added some vars for portability