Fixed warnings, will merge group's code