Fixed all instances of static::