minor clean-ups to 1.1.5