Fixed static errors