Some slight improvements to v147