removed serveral warnings