minor updates in case folks want to build on 1.6