Mock validation message and other minor fixes.