Fixed validation messages

This is part of #479