Small improvements to blueprint