Anita fixes