Updates calls for self to static in getInstance to support late static binding