Convert some methods to static. Fix static access issues this created.