misc small changes to polish after include cleanup