fixing build and closing 3.5