Minor improvements to make