-"Fix" static references, guess I'm a sucker for consistent design even
when its time wasting verbosity adding crap