Fixed a lot of static access stuff