conv reshape fixes