Minor improvements to 45