Some more Springiee message improvements