Fixed static references to object attributes