Small wrap-up changes