Bake in signals
Fix unique error messages